Merge pull request #11 from mysterio56/master_prod

Master prod to master
Merge pull request #22 from mysterio56/master

horas