Merge pull request #47 from starteam/master

Merge