wip
Merge pull request #2 from adonespitogo/feature/new-feature

wip