Merge pull request #578 from gameblabla/counters_lib