Cleanup!
Merge pull request #5 from iani/master

Cleanup!