[General] Resolved #369
Merge pull request #370 from frmwrk123/ticket_369

[General] Resolved #369