merge w. giulio (master)

add formula in detailed desc.