Fix intentions
Add charset detection support