Version 0.7
Merge branch 'dev_0.7'