Second attempt at merging #159