Address feedback in PR
Merge pull request #994 from ebidel/customelupdate

Address feedback in PR