Update to be compatible with xCode 6 (release)