merging issue 53