fixes in encoding
More info in REDME