ios8 fixes
Merge pull request #13 from rdougan/master

ios8 fixes