Merge pull request #8 from mariodrash/samuel

Merge pull request #7 from mariodrash/master