More command line arguments, + fix
Merge pull request #12 from horvist/hotfix_commandLineArguments

More command line arguments, + fix