fixes #14
Merge pull request #39 from UPC-TP3-2014-2/personal

[Personal] Correcciones de defectos