Merge pull request #18 from horacio3/dev

Dev