Merge pull request #5 from dagobailon/develop

Develop
Merge pull request #6 from dagobailon/models_feature

Merge pull request #5 from dagobailon/develop