Merge branch 'hotfix/issue#3' into develop
Merge branch 'develop' into v0.0.2