updated models
Merge pull request #5 from bchiatt/models

updated models