Mejoras para la v2.0
Merge commit '0928bf8778a246071802fe3a4f9b8335f56b173e' into version2.0