Added --count feature