Merge pull request #8 from thebirn/master

pull
Bug Fixes
Merge pull request #25 from thebirn/luis_augusto

Luis augusto