take care of right encoding
Merge remote-tracking branch 'upstream/master' into utf8
Merge branch 'master' of https://github.com/Codiad/Codiad into utf8
Merge pull request #306 from daeks/utf8

take care of right encoding