Allow --parallel to be specified on command line
Merge pull request #3 from gaye/parallel-arg

Allow --parallel to be specified on command line