Merge pull request #283 from guillermo-carrasco/master

Hot fix: Merge mfs_dir with basename, not with absolute path
Merge branch 'master' of http://github.com/guillermo-carrasco/bcbb