Fixing a giant memory leak.  Closes GH-61