Merge pull request #3 from Raxa/master

Cleanup