Merge pull request #112 from mackk/master

EJB mod
Merge pull request #14 from rockamorales/master

Mas modificaciones