Merge pull request #48 from lategoodbye/master

parseable for splint, fix memleaks, minor fixes