include comment counts
merge master