Resolves #189.
Merge pull request #191 from frmwrk123/enhancement/189

Resolves #189.