Added to-do.
Merged compatible code from master branch.
Merge pull request #2 from jtobey/no-statistics

merged changes