Merge pull request #194 from ping19/master

Version update/ Code tidy