Merge pull request #587 from ndawe/master

missing self
Merge pull request #588 from ndawe/master

missing classes in stats/__init__