Merge remote-tracking branch 'hojel/hentaistigma'