Issue 830: initial commit
Merge pull request #847 from sanai56967/830

#847: pull request Issue 830: initial commit