Merged Nick-san's English corrections.