fixes
Merge pull request #1 from grahn/master

fixes for directory paths