Bug fixes and support for touch
Merge remote-tracking branch 'origin/master'