refactoring
Merge branch 'release/v0.6.1'