Merge pull request #10 from levfurtado/devondegrazia

Devondegrazia
Someone committed a conflicted file.
Fixes #8 fixes #11