Clean Up
Merge pull request #67 from P4V4/master

Clean Up