Fix two leaks, fix to use standard method naming conventions to allow useful static analysis. Some issues remain.
Merge pull request #10 from bangnoise/leaks-and-analysis

Fix two leaks, fix to use standard method naming conventions