Fix encoding
Just refactoring
Merge pull request #1 from js-coder/master

Just some refactoring and proper UTF-8 encoding. :)