Merge pull request #2 from farina-game/master

Merge pull request #24 from reger-men/master
model
Merge pull request #26 from reger-men/master

Model merge