Fixing some problems on merge #40
Merge pull request #41 from mateuscomp/master

Fixing some problems on merge #40