Fixed issue #114 and #135

A general comment about this file, why haven't you use `Filer.Path` in order to extract bits of a path?