[General] Resolved #351
Merge pull request #377 from frmwrk123/ticket_351

[General] Resolved #351