Reworked readme.
Merge branch 'master' into iphone