Added handling for command line args #3

See issue for more info.