Version bump and updated CHANGELOG
Merge pull request #329 from twokul/version-bump-23

Version bump and updated CHANGELOG