Fixed cleanUp problem
Merge pull request #19 from dafuer/master

Fixed cleanUp problem