pull updates from stevenlovegrove