Issue19: fixed tabs
Issue8: Fixed tabs
Merge branch 'master' into Issue2
Comitting for backup