More command line arguments
Merge pull request #11 from horvist/feature_commandLineArguments

More command line arguments