I think we *are* handling spaces reasonably
Merge pull request #13 from pikesley/handle-spaces

I think we *are* handling spaces reasonably