fix bug & per page count
Merge branch 'master' into counter_version