Merge pull request #42 from starteam/master

Callback
Merge pull request #43 from starteam/develop

Merge pull request #42 from starteam/master