Merging in the lastet OReilly changes (hopefully)