Merge pull request #3 from vernon99/master

Xcode beta 3 fixes (mostly for CGFloat Float to Double change)