optimisation
tabstop support
Merge branch 'tab-support'