UTF-8 bugfix
Code cleanup
Merge pull request #8 from tavaresb/master

Bugfixing and code cleanup