Merge pull request #1 from tpedrob/master

give it to me
ainda nao
Merge pull request #3 from RickGSF/master

blabla