Quicker response on touch events
Merge branch 'master' into squares