added support for spaces in strings