Merge pull request #237 from ping19/master

Version bump