put cleanup back
Merge pull request #139 from georgebyelas/master

put cleanup back