updated to latest rmerlin