Merge pull request #1 from MartinEmilio/master

commit martin2
Merge pull request #3 from dauv815/master

Merge pull request #1 from MartinEmilio/master