Merged from master
Added cursor to the display
Merged from diego