add cleanup
Merge pull request #290 from teharrison/develop

add cleanup