re-added Count method
Merge commit 'ecccc582c6764debc25cfde9f16f42d28ccb5fc1'