Merge origin/master into julio

Conflicts:
	henry.php

tambien subi mi cambio
Merge pull request #11 from henrikelopez/julio

Merge origin/master into julio