merged issue 65