Merge pull request #5 from germanop/dev1

file1
Merge pull request #3 from germanop/dev2

file2
file3