tab, fixes #16, fixes #17
Merge pull request #18 from ondras/master

tab, fixes #16, fixes #17