merged with pull request; new version number