Feature completed
Merge pull request #7 from jorge-trujillo/jt-new-feature

Feature completed