encoding
Merge pull request #35 from edigotlieb/dev

encoding