Upgraded version to 0.7
Merge remote-tracking branch 'upstream/master'