Merge branch 'release/0.2.0' into develop
Add a lot of new units and refactor code
Merge branch 'release/0.3.0'