Version update
Merge pull request #302 from ping19/master

Version update