merge w. giulio (master)

perhaps mention if volume if constant