Improved support for iOS/Android browsers
Merge branch 'master' into gh-pages