Parallel (follow up)

Implement most of the changes from pull request #27 comments