Fixes #8 fixes #11
Merge pull request #12 from levfurtado/devondegrazia

Fixes #8 fixes #11