Merge branch 'master' of https://github.com/juanpri/pru20

Conflicts:
	README.md