encoding
Merge pull request #37 from edigotlieb/dev

encoding