fix yaml mode
added wrapper
Merge pull request #521 from daeks/yaml

Fix: yaml mode
Merge pull request #522 from daeks/wrapper

Enhancement: added wrapper
Merge pull request #2 from Codiad/master

Merge from origin.