Merge pull request #1254 from clebertsuconic/master

small tweaks