Bug fixed com os choosens
Merge origin/master