Merge pull request #4 from leovir086/master

Merge branch 'leovir086-feature'