added text field scrolling
Merge remote-tracking branch 'origin'