issue-71: code changes after reviews
Merge pull request #116 from hhuynh/issue-71-final

issue #71: Basic stats