Fourth feature pull request from Jorge

I would like somebody to review this