merge new version into latest #16

Closed edwardteach42 closed 4 months ago