uifix
Merge branch 'master' of github.com:FeisEater/nhjpn