Updated Model
Merge pull request #9 from Thuleando/master

Updated Model