Improving cleanup
Merge pull request #16 from cloudsleuth/master

Improving cleanup