fixing bug with drag and touch
pull merge from lmccart-master