Merge pull request #101 from Schtee/master

Fixed tab ordering