Add ability to deal with names with spaces