Tab fixes 2
Merge pull request #6 from nt1m/master

Tab fixes 2