Pull from shaldengeki:master to Pichu0102:dev

I will regret this.