Merge PR #27, updated version number