Merge pull request #140 from pingww/main

fix #88