added merlin support