Merge pull request #342 from jpecht/master

syncing versions