cambios 04
Merge branch 'master' of https://github.com/promoteserver/canon