fix #392
fix #391
fix #390
fix #388
fix #394
fix #389
fix #387
#382
v0.4.21
Merge remote-tracking branch 'origin/master' into xtag