Merge pull request #3 from mariodrash/master

Mario
Merge pull request #5 from mariodrash/samuel

Merge pull request #3 from mariodrash/master