Fix #55
Merge branch 'fix-tab-issue'