fixed memory leaks. closes issue #52