Allow Spaces

Patch to allow spaces within fields.