[General] Resolved #360
Merge pull request #366 from frmwrk123/ticket_360

[General] Resolved #360