Merge pull request #80 from DavidVorick/race

Makefile race detection
Merge branch 'master' into concurrency