merge bug fix
Merge branch 'master' into counter_version