fixed some count logic
fixed tests for count update
Merge pull request #33 from RantGames/count-logic

Count logic