Merge pull request #37 from MaDDoGo/master

Actualizado el branch al master
Version bump
Merge pull request #38 from MaDDoGo/frodo

Distribuidos cambios de la branch frodo al master.