Merge pull request #8 from mariodrash/samuel

Merge pull request #7 from mariodrash/master
Merge pull request #10 from mariodrash/master

Merge pull request #8 from mariodrash/samuel