Fixes Issue #38 and #39
Merge pull request #41 from gwu-libraries/refactormodel

Fixes Issue #38 and #39