Updating for Kevin
Merge pull request #1 from willietran/develop

Updating for Kevin