Fixing cursor some so it does not blow up when there is no cell to move to or read
Merge remote-tracking branch 'origin/master'