Bug #5858
Merge pull request #88 from apatel/master

Bug #5858