feature1 a medias
fixes #1: feature 1
Merge remote-tracking branch 'origin/develop' into develop: Jesus GyG