Merge pull request #1 from MrGate/master

Merge
Cleanup
Merge pull request #2 from williamknauss/master

Nice! Thank you