Merging diagrama 3

In develop3