Merged changes into master #378

Closed santosb93 closed 2 years ago