Merge pull request #2 from guilhermegregio/master

Tests