Version update
Merge pull request #397 from ping19/master

Version update