Merge pull request #1 from ptdorf/master

Merge pull request #1 from jpedro-barbosa/master