Added Yaml support for #586

Added Yaml support + fixed some PSR-2 standards (spaces)