Add description
Merge branch 'master' into feature/html_filter