Merge pull request #56 from rickcarlino/master

Cleanup
...
ITS WORKING!!!! ITS WORKING!!!!