#148 - memory leak fixes