Fixes: Path handling, calloc checking...
Merge pull request #1 from zeehio/master

Fixes: Path handling, calloc checking...