Fixed unicode
Merged master