Merge pull request #1 from lccavalcante/master

Merge
Merge pull request #2 from gmoura/master

Merge pull request #1 from lccavalcante/master