Issue133 - Contextual cursor