Working branch

merge to current status
- added filtering options
- added --help with command overview