Default controll added.
Merge remote-tracking branch 'luiz_remote/master'