Merge pull request #291 from russelltg/ios_compile_fixes

Fix build for iOS