Make combination of -n and -q options work
Merge pull request #171 from troessner/issue-combined-options

Make combination of -n and -q options work