Compilation fix for latest versions of Xcode, extract duplicated code and use iOS-style function for accessing shared service..
Merge pull request #1 from andrewebling/master

Compilation fix for latest versions of Xcode, extract duplicated code an...