Merge pull request #68 from Javichuck/master

Descomentadas pruebas Martín
Merge remote-tracking branch 'upstream/master'