Clean Up
Merge pull request #30 from P4V4/master

Clean Up