Patch Against Branch Develop for Issue #227

Same changes as the previous pull request, but against the develop branch.