works entirely, but memory leak
Merge branch 'master' of https://github.com/rdryke/4061