* renamed key
* changes due to the new layout of example.yml (that should be template.yml)
* some structure checks for the yaml file
Merge remote-tracking branch 'origin/master'
* command-line switches and options