Added YAML file
Small fixes