Merge pull request #15 from xasos/master

Cleanup