Added counter removal

v2.0.0
Merge branch 'develop'