Closes #7: perTab feature and bugfixes with the counter
removed unnecessary check