[General] Resolved #349
Merge pull request #363 from frmwrk123/ticket_349

[General] Resolved #349