Fixed #227
Merge pull request #229 from frmwrk123/fix/227

Fixed #227