fixed #252
fixed #202
fixed #262
fixed #205
Merge branch 'master' of https://github.com/hoyoji/HoYoJi