Update from origin

Just bringing my fork up to date.