Version update
Merge pull request #357 from ping19/master

Version update