fixed space handling in commands (issue #495)
Merge pull request #503 from rose-m/issue-495-fix

fixed space handling in commands (issue #495)