Proposed merge of Phillpott into Philpott

edit