Merge branch 'release/0.2.1' into develop
License fixed to original author
Merge branch 'develop'