Cleaning and fix utf-8
Merge pull request #13 from titilambert/master

Cleaning and fix utf-8