Xcode 6 Beta 7 fixes
Merge pull request #3 from raylai/master

Xcode 6 Beta 7 fixes