distinct option for count
fix indentation
Merge pull request #2079 from TheBenji/1.7.0

distinct option for count