Merge pull request #655 from afs/riot-count

JENA-1802: Flag --count for riot