Add count method
Merge branch 'dev'