updated models
Merge pull request #4 from ABarnhard/models3

updated models