Merging #314 + typo fix