Merge branch 'develop' into release-0.1
Include CHANGELOG
Merge branch 'release-0.1' into develop