Fixes #576 and fixes #575
Merge branch 'develop' of github.com:NEU-Libraries/cerberus into develop