Merge pull request #1 from zackw/master

Update from upstream
iOS 6.1
Merge pull request #2 from davidcorry/master

Add iOS