make sure the paths and cwd are handled properly
Merge pull request #1 from ludicruz/master

make sure the paths and cwd are handled properly