adjusting some bugs
Merge pull request #18 from moacirmoda/master

adjusting some bugs