Fixed model issue
Merge branch 'master' of https://github.com/cpiggott/the_a_team