merge cbournsell branch