Merge pull request #48 from edigotlieb/dev

test