Added some fixes and updated your demo to YAML 4