Master ks

Hi Karl - PR as discussed