Merge branch 'master' of github.com:grosser/parallel