Merge pull request #3 from pedrorgirardi/master

Fixes for Xcode Beta 7