Merge pull request #24 from NicolasKessler/master

Fixed errors in the model