decode characters
revert removed text
remove whitespace
fix merge conflict
Merge pull request #7 from voceconnect/fix-for-intl-characters

Fix for intl characters