Merge pull request #11 from bitlogica/master

Xcode 6 beta 5 compatibility