Fix #955
Merge pull request #956 from sunnyratilal/master

Fix #955