Added some small stuff (hdf5 among others) from the last master commit, that would have gone lost otherwise