Merge pull request #1 from markmarco16/master

Actualización del framework
Merge remote-tracking branch 'upstream/master'