Adjusted to work on iPhone but still needs some work
Merge branch 'master' into gh-pages