Merge pull request #182 from ping19/master

Code cleanup
Merge remote-tracking branch 'upstream/master'