Dfinley master

A small contribution to your own contribution ;)