Merge pull request #9 from iToto/master

Cleanup