Issue133 - Contextual cursor

References #133