Fixed problems with charset thanks to @fernand0 closes #2