Merge pull request #47 from starteam/master

Merge
Merge pull request #48 from starteam/develop

Merge pull request #47 from starteam/master