Merge pull request #49 from R-Rajkumar/master

Fixing PAAS-148