Fixing up models
Merge pull request #62 from gambitsunob/master

Fixing up models