fix #201
fix #87
Merge branch 'master' of https://github.com/hoyoji/HoYoJi