commit
Merge pull request #1 from gdaAquino/Integration_Branch

commit
Minor refactors