Merge pull request #6 from thebirn/luis_augusto

Bug Fixes
Merge pull request #8 from thebirn/master

pull