Merge pull request #969 from clebertsuconic/francisco-bridge

Sending francisco's commits after a few minor changes