merging from master #1

Closed josd closed 2 years ago