some modif
encoding fixed