Update my branch to the most update ones to check for different edge cases #31

Closed yuruizhang9734 closed 2 years ago