Ready to publish as rock.
Fixed xml and yaml usage. Fixed doc