merge w. giulio (master)

"brief" should be a very short description. Add an empty line to begin detailed desc.