Merge branch 'hotfix/0.0.2' into develop
Merge branch 'master' into develop
work in progress
Merge branch 'release/0.0.3'