fixes
text
work
fix
Merge branch 'master' into gh-pages