Xcode 6.1 Beta 2 fixes
Merge pull request #11 from depl0y/master

Xcode 6.1 Beta 2 fixes