Merge pull request #44 from edigotlieb/dev

encoding