Issue/515

Can be integrated in master, but is missing of a graphical enhancement ("click to see more")