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