Merge pull request #8 from dagobailon/develop

Develop
Merge pull request #9 from dagobailon/feature_views

Merge pull request #8 from dagobailon/develop