Don't mangle outputs if searching for all
Don't print count unless we find something
Merge branch 'master' into shrikhande

Bugfixes