Bugfix tabs + minor improvements

Bugfix tabs + minor improvements
Merge pull request #88 from jslegers/master

Bugfix tabs + minor improvements