YAML support
Remove comments
update document