Cleanup
Merge pull request #50 from dreamteam69/master

Cleanup