refactoring
Merge branch 'release/v0.5'