iphone done
ipad and iphone done in all ranges
Merge branch 'issue-85' into develop