merge from henry
Merge remote-tracking branch 'hdf/master'