#132 #131 resolvidos
Merge branch 'master' into release