Merging #298 + fixing typos