CONN-1175 and CONN-1176 Applied review comments
Merge pull request #13 from vsaibabu/CONN-1175

CONN-1175 and CONN-1176 Applied review comments