Merge pull request #14 from dmcclean/master

Fix tests
version bump and CHANGELOG