Merge pull request #19 from fgarbagnati/master

fixing weird merge issues
Merge pull request #21 from fgarbagnati/making_some_models

Merge pull request #19 from fgarbagnati/master