#138 #137 resolvidos
Merge branch 'master' into release