Lots and lots of fiddly details improved, against iPhone 5
Merge pull request #92 from alxdarksage/develop

Lots and lots of fiddly details improved, against iPhone 5