merge #245