Responsive - works on iPhone
Merge branch 'develop'