Merge pull request #7 from joanromano/master

Model refactoring with Mantle