Merge mfs_dir with basename, not with abspath [ci skip]
Merge pull request #283 from guillermo-carrasco/master

Hot fix: Merge mfs_dir with basename, not with absolute path