Merging #316