Fix the changelog to make the changes listed for v0.2.1 accurate
Merge branch 'master' into develop
Update changelog