Added two lines
Touch controls
Merge branch 'master' into gh-pages