Version update, code cleanup
Merge pull request #228 from ping19/master

Version update, code cleanup