Merge pull request #453 from domesticmouse/master

There is a disk leak somewhere, unsure where.