Merge pull request #1 from pedromagnus/master

updates!! :)