merge new version into latest #16

Closed edwardteach42 closed 3 months ago