Merge pull request #13 from fgarbagnati/master

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

Merge pull request #13 from fgarbagnati/master