fixed #168
fixed #239
fixed #263
Merge branch 'master' of https://github.com/hoyoji/HoYoJi