added check for mobile devices
Merge branch 'master' into gh-pages