Refactor code
Merge branch 'release/0.2.0' into develop