Fi x count methods
Merge pull request #137 from cortiz/master

Fi x count methods