Merge pull request #78 from nicolasnoble/parallel-build

Fixing parallel build.