Deployed: Merge pull request #150 from masondesu/schol-fix

generated from commit 27b216b70408ada437bf9c170dd01fae70105241