Merge pull request #1 from jhcecato/master

bill
Merge pull request #2 from felipebill/master

aa