Standardize count method names
Merge pull request #92 from chdemko/master

Standardize count method names