Made updates suggested in PR #632