Merge pull request #5 from leovir086/feature

Merge pull request #4 from leovir086/master