Change encoding
Merge pull request #95 from Doha2012/master

Change encoding