Improvements to CLI input parsing and filtering
Merge pull request #9 from balr0g/filtering-fixes

Filtering fixes