BLK-146 fix counting double
added change for reset as well
minor update to mixins to pass unittests
Merge pull request #5 from nio-blocks/doublecount

BLK-146 fix counting double