Fixing bugs
Merge pull request #18 from alandbarroso/develop

Fixing bugs