Merge pull request #40 from MarcelloDuarte/develop