Parallel: Bring branch up to date with master

[wperkins]

This brings the changes from pull requests #35 and #36 (issue #27) into the parallel branch.