These are some changes that I made
Merge pull request #1 from jlaudadio/develop

These are some changes that I made