multi touch, in place but not working
Merge remote-tracking branch 'origin/master'