html is now safe
Merge branch 'master' into bio