Fix command line parser
Merge pull request #13 from xoppa/master

Fix command line parser