Merge pull request #1467 from conejoninja/develop

fix
fix
fix issue #1473
Merge pull request #1482 from conejoninja/1473

1473