Minor refactoring
Update version number
Update CHANGELOG.md