Fixed parallel installation issues
Merge pull request #187 from pyromaniac/master

Fixed parallel installation issues