Minor refactoring
Fix unicode issues (hopefully)
Bump version