Update For oF 0.8.4, XCode 6.1.1