Correccion en bug1.0
Merge branch 'hotfix/bug1.0' into support/v1
Merge branch 'prueba' into develop

Conflicts:
	Main.java
Commit en develop
Merge branch 'release/relase2.0'