encoding
Merge pull request #38 from edigotlieb/dev

encoding