Corrected bug
Merge remote-tracking branch 'paulo/master'