Fixed detection not working on OSX
Merge branch 'master' into release