PAAS-129
Merge pull request #46 from gayangunarathne/master

PAAS-129 issue fixes