merge from Martin's branch