Fix regression in command line tokenization
Merge pull request #69 from hernando/patch-2

Fix regression in command line tokenization