Merge pull request #7 from MartinEmilio/master

commit_17-02-14-3
Merge pull request #8 from MartinEmilio/Duvan

Merge pull request #7 from MartinEmilio/master