Counter Updates
Merge pull request #2185 from flukeout/counterupdates

Counter Updates - fixes #2152