fixed special characters in non-Chrome browsers
Merge branch 'working'