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

...