changes for xcode 6.1

changes for Xcode 6.1. Fixes #16