FIX for issue 963, Add html_safe and fix spelling errors
Resolved conflicts during merge
Merge pull request #970 from m-bodmer/issue963

FIX for issue 963, Add html_safe and fix spelling errors
Closes #963