fix #376
v0.4.17
Merge remote-tracking branch 'origin/master' into xtag