Version update
Merge pull request #270 from ping19/master

Version update