Modified to oF v0_8_0. Built and tested on Mac OS X 10.9.2.

I'd like to merge this, please.