Jas 21 interim merge so that work can be done on #25 

interim merge so that work can be done on #25