stub in new class for stat tracking
add new class to CMakeLists
fix some typos and keep back compatability for BasicStat
Merge remote-tracking branch: upstream/master