Merge pull request #1018 from brooksryba/develop

Develop
Merge pull request #1020 from brooksryba/develop

Adding in auth pull request