[cwd] correction for touch devices ( fix #266 )
Merge branch '2.x' into 2.1