Merge pull request #10 from phpwarlock/pepeto

pepeto
pepeto2
Merge branch 'pepeto' of https://github.com/phpwarlock/test into pepeto