Merge pull request #16 from rockamorales/master

Merge all
Merge pull request #46 from mackk/master

done
Merge pull request #47 from schumy21/master

schumy
Merge pull request #21 from rockamorales/master

Modificaciones a consulta