Merge pull request #1 from KyoX/master

sincronizando
Merge pull request #2 from KyoX/kyoxBranch

Merge pull request #1 from KyoX/master