Merge pull request #81 from RaulBer/master

Issue #6, #8
Se solucionan issues #72 y #74
Merge pull request #82 from jrrmerlin/master

Se solucionan issues #72 y #74