Merge pull request #1 from BrettKoenig/master

Pulling in recent commits.
Added iOS information (except sources)
Merge pull request #2 from c-meek/master

Added iOS information