Update changelog
Bump version number
Merge pull request #295 from dmcdougall/bump-version

Bump version and update changelog