Merge pull request #91 from chdemko/master

Update Copyright
Correct typo
Standardize count method names