Support whitespace
Merge pull request #56 from gameclosure/fix-ws

Support whitespace
Merge with develop