Fix for another segfault/leak case when using -f arg
Merge pull request #466 from naxuroqa/master

Fix for another segfault/leak case when using -f arg
small bug fixes
Merge pull request #467 from JFreegman/master

small bug fixes for toxic
Merge branch 'master' into shared-lib