Improved models
Merge pull request #9 from martindido/improvements/models

Improved models