Code refactored, nice names. Fixes #1
Fixes #8. UTF-8 everywhere