Update models.py
Merge branch 'master' into kingman