Merge pull request #1506 from clebertsuconic/master

adding test and traces