fix cleanup
Merge pull request #26 from ooyala/fix_cleanup

fix cleanup