Merge pull request #1 from joaocgreis/master

Testing pull requests