Better format/encoding

More to come - Do you accept PR´s? @monowii