Merge pull request #19 from iferguson90/master

Second attempt: Allow parallel-by specifications to be grouped