Merge pull request #2 from MrGate/master

Merge
Merge pull request #3 from MrGate/master

Master
Huge Update to cleaning
Merge pull request #4 from williamknauss/master

More Cleanup