Fixing global leak
Merge remote-tracking branch 'origin/feature.char-count'