some model changes
Merge pull request #16 from danvbe/sergiu-develop

some model changes