Merge pull request #171 from jelmer/parallel