Fix argment handling and quoting.
Merge pull request #2 from inxonic/master

Fix argment handling and quoting.