trying to make it work better on mobile devices
Merge branch 'master' into gh-pages