Merge pull request #1 from JerryZendy/master

Pull1
Merge pull request #2 from JerryZendy/sergio

Merge pull request #1 from JerryZendy/master