Merge pull request #1204 from conejoninja/develop

Develop
some fixes on update process