Merge pull request #20 from rockamorales/master

Merge
Merge pull request #46 from mackk/master

done
Merge pull request #47 from schumy21/master

schumy
Merge pull request #17 from rockamorales/master

Modificaciones a consulta