Merge pull request #2702 from modwizcode/patch-1