Merge branch 'release-0.2.0'
Fixed bug in Changelog
Merge branch 'hotfix-changelog' into develop