Merge pull request #43 from stcrestrada/master

Merge 2 Estrada