Yamanetoshi 17

merge, please...