merge some changes from work branch #17

Closed donutz03 closed 1 week ago