More command line arguments feature branch
Merge pull request #8 from horvist/feature_commandLineArguments

More command line arguments feature branch