merging from fork #48

Closed kreaturen closed 2 years ago