fix #99
fix #108
fix #115
fix #116
fix #79
Merge branch 'master' of https://github.com/hoyoji/HoYoJi