Merge origin/master
Merge pull request #7 from MayaraAmanda/master

:p