minor fixes for v0.10 path.join changes

avoids TypeError: Arguments to path.join must be strings
Merge pull request #1 from mandric/master

minor fixes for v0.10 path.join changes