H bartosik

Dear Kevin. Please pull these changes into the master