Fixed Model Stuff
Merge pull request #73 from mreist/Jay

Fixed Model Stuff