Integrate code changes from fork

[nyg]

Hello @jiaqi,

I see you've merged a few PRs recently, maybe you have more time for the project :).

I've contributed a few PRs on LeMyst's fork which has now been archived (don't know why). Would you be interested to integrate these PR in your codebase?

LeMyst#149
LeMyst#156
LeMyst#166
LeMyst#172

Let me know, I could try to create new PRs.

nyg