Add a few tool stats
Merge remote-tracking branch 'origin/master'