Merge pull request #42 from starteam/master

Callback