Bugs fix
Merge pull request #49 from vmachuca/master

Bugs fix