Patch up that memory leak, closes #18