Merge pull request #79 from stcrestrada/stephen

Stephen