Accept new command line arguments
Merge pull request #1838 from hawkthorne/fix_osx_app

Accept new command line arguments