Fixing some problems on merge #43
Merge pull request #44 from mateuscomp/tests

 Fixing some problems on merge #43