added explicit integer cast (Xcode was getting nervous)
Merge remote-tracking branch 'origin/master'