Finished changing self.model to obj.Model
Merge pull request #36 from FRidh/master

Finished changing self.model to obj.Model