added more cleanup code
Merge branch 'master' of https://github.com/emetchar/wi14