Merge pull request #4 from cru-Luis-Rodriguez/Development

Merge pull request #3 from cru-Luis-Rodriguez/master
Merge pull request #5 from cru-Luis-Rodriguez/master

Merge pull request #4 from cru-Luis-Rodriguez/Development