Merge pull request #18 from stcrestrada/master

JWag and Estrada merge 2