cleaning up tabs
Merge branch 'master_inc'