added handling of up and down arrows
Merge remote-tracking branch 'origin/master'