merging PR 246