latest master from Yusuke-san

Thanks!