Merging #318