update CHANGELOG
Merge branch 'master' into v0.5.1
update changelog
Merge pull request #85 from Trott/v0.5.1

V0.5.1