copy updates per Wing-See's feedback
Merge branch 'master' of https://github.com/numnums/sleepy-retreat-7565