Harmonize cli options
- Fixes #5