Code refactoring and some improvements
Bump version 0.2.0
Merge branch 'release/0.2.0' into develop