Fix a memory leak
Fix a memory leak
Merge pull request #22 from mecking/leak_fixes

Fix some memory leaks