Merge pull request #1 from db23/daniloB

3 committ
Commit to fork
Merge pull request #2 from LFilips/master

master