Last iPad changes.
Merge pull request #57 from jorisvervuurt/master

Last iPad changes.