Merge mattjeffery's commit

Merge mattjeffery's commit