Merge pull request #47 from edigotlieb/dev

test