- updated for Xcode 6.1
- trimmed trailing whitespace