Minor fixes...
3.4: Added --max-count and --count options