Merge pull request #1 from jonnyreyes/tupadre

commit ahmet pull request
Merge pull request #2 from jonnyreyes/master

Merge pull request #1 from jonnyreyes/tupadre