Merge pull request #1 from starteam/master

Major improvements
Merge pull request #2 from iceraj/master

Develop
Merge pull request #6 from iceraj/develop

Develop