#180 #188 resolvidos
Merge branch 'production' into release
#176 resolvido
#191 resolvido