Now reseting count with the reset button.
Merge branch 'develop'