Merge pull request #2 from jhenrique09/7.1.1

Updates