New main
new config for reescaling
Merge commit '1aad069f0db344c0e4b4d7a1bfa1d00251b3e1e6' into Develop