Merge pull request #10 from bbinet/missing-makedirs

Various small fixes