fix complex command line parsing
Merge pull request #1 from tdebarochez/master

fix complex command line parsing