fix #228
fix #124
fix #79
Merge branch 'master' of https://github.com/hoyoji/HoYoJi