work resilient to spaces
Merge pull request #1 from rubillionaire/master

work resilient to spaces