Code cleanup with version update
Merge pull request #97 from ping19/master

Code cleanup with version update