Merge pull request #257 from ping19/master

Cleanup/ version update