Code improvement
Merge pull request #1 from luizbranco/master

Code improvements