Fixed issue with updated YAML parser. Added option to set any YAML-block delimiter. General refactoring