On Play GUI
Merge from semvidEAFIT
Fixe
Beta
Merge pull request #42 from halzate93/master

Beta