Merge tag '1.2.1' into develop

v1.2.1

Fix:
- improved the output of the built-in help
New: support for merging in default switches from a config file
Version bump
Merge branch 'release/1.3.0'