Corrigida a página 500
Merge branch 'master' into development