Fix broken models.
Merge pull request #19 from dmend/master

Fix broken models.