Fix for OS X
Merge remote-tracking branch 'r0mai/master'