[General] Resolved #359
Merge pull request #367 from frmwrk123/ticket_359

[General] Resolved #359