Clean Up
Merge pull request #57 from P4V4/master

Clean Up