Added return of count only option

For your review!

@peetucket @carrickr