adjust for xcode 6.1
Do the math in CGFloat
Remove unused cast
Merge pull request #1 from corinnekrych/xcode6.1

adjust for xcode 6.1