Merge branch 'hotfix/0.2.1' into develop
Merge pull request #6 from vbergae/develop

Merge branch 'hotfix/0.2.1' into develop