Merge pull request #377 from gabrielmcoelho/patch-1

Add more consistency to code