Fixing Tools 2559
Merge pull request #106 from kaviththiranga/developer-studio-3.7.0

Fixing Tools 2559