Kmh branch6

branch6 from kmh