Added unicode support
Trying to fix bugs