Update mediator
Update parseHtml
Merge branch 'develop'