Add two traces...
Merge pull request #34 from agueganno/minor-improvements

Add two traces...