Update Develop V0.40

Signed-off-by: Michele <michele@webemme.net>
Add to Develop V0.40

Signed-off-by: Michele <michele@webemme.net>