Merging #341