[#59179970] Update fork
[#59179970] Fix broken test
[#59179970] changes after merge conflict
Merge pull request #7 from codificadas/changes-from-original-repo

[#59179970] Update fork
Merge branch 'master' into hoxfix-routes

* master:
  [#59179970] changes after merge conflict
  [#59179970] Fix broken test
  [#59179970] Update fork