changed pageX to clientX
Merge remote-tracking branch 'upstream/master'