add count method
Merge branch 'develop'