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