Merge pull request #11 from Disoft/Jorge-Admin---Branch

Merge pull request #10 from Disoft/master