some fixes
Merge pull request #1 from fwbrasil/master

some fixes