Merge in fix for issue #32

- Merge in the branch
- Run a build
- Bump the version