Merge pull request #1 from suarezoo/master

update me
Merge pull request #2 from tophurian/master

Merge pull request #1 from suarezoo/master