Merge pull request #59 from RaulBer/master

Issue #9
Se arregla Bug #35
Merge pull request #61 from jrrmerlin/master

Se arregla Bug #35