added from kmy0ra2

please merge