Encoding
Merge pull request #54 from mdahm/master

Encoding