Merge pull request #440 from euanh/parallel-make

Parallel make