Add counter
Merge pull request #622 from dz0ny/master

Add counter
Merge master into develop