Fixed bugs
Merge branch 'release/v0.7.2'