Fix cleanup
Merge pull request #69 from tbeu/patch-cleanup

Fix cleanup