Import Upstream version 0.7.1