Merge pull request #92 from chdemko/master

Standardize count method names
These classes are not designed to be publicly instantiated