Added cleanup
Merge pull request #8 from kaedroho/cleanup

Cleanup