Modularise counter template, closes item:634
Merge pull request #414 from tlvince/refactor/counter-template

Modularise counter template, closes item:634