fix #213
fix #120
fix #228
fix #229
Merge branch 'master' of https://github.com/hoyoji/HoYoJi