Changed to UTF8
Merge branch 'origin/Solfamidas'
Merge branch 'origin/Solfamidas'