Added long line highlighting
Merge branch 'master' into unstable
Added insert-lines