Merge pull request #42 from edigotlieb/dev

encoding test