Better model.
Merge pull request #9 from ismailsunni/master

Better model.