Make it work on the iPhone

This probably isn't a general working mobile solution
Merge branch 'master' into gh-pages