Clean Up
Merge pull request #59 from P4V4/master

Clean Up