Tab insert

Intended to fix #35 and #6