Merge pull request #30 from elitenomad/federico

fix bug in expense and portion model