Updating from markdown branch