Still some encoding issues
Merge pull request #99 from sarakha63/develop

Still some encoding issues