add support for space
Merge pull request #1 from pevik/upstream

add support for space