markup beautified
Merge branch 'master' into svg