Update for OS X build instruction
Merge branch 'toxxxer-patch-1'