Handling spaces in names (see #29)