Merge pull request #36 from edigotlieb/dev

encoding