Fixed #226
Merge pull request #230 from frmwrk123/fix/226

Fixed #226