FIXES #66 mapfile names with spaces