- refactored to compile with Xcode 6.1.1GM