Developer edits
Merge pull request #1 from oieduardorabelo/develop

Developer edits