Sync UseCounter features
Merge pull request #175 from foolip/sync-usecounters

Sync UseCounter features