Version update
Merge pull request #140 from ping19/master

Version update