Merge pull request #1 from seanbuscay/develop

Develop
Merge pull request #2 from seanbuscay/master

Merge pull request #1 from seanbuscay/develop