Fixed issue #114 and #135

What about paths with escaped `\/` in them?  I think it's safer to use `Path.dirname` to get sub-dirs along a path.