Merge pull request #4 from luisromangz/8.1-ohiggins-SNAPSHOT

Changes done and undone because it was not needed