I want to pull mnjrupp's changes into my fork

pull mnjrupp:master into jesslilly:master

This would put all enhancements into jesslilly:master