closes 37_encoding
Merge branch '37_encoding'