Fixed some bugs
Merge branch 'release/v0.6.5'