Added cursor line
Updated from upstream.