change to utf-8
merge code from carl
Merge pull request #1 from Joinhack/master

Merge from JoinHack