Last iPhone changes.
Merge pull request #56 from jorisvervuurt/master

Last iPhone changes.