Revert "Merge pull request #1 from gabrielsr/master"