Merging #298 + fixing typos
Fixing conf
Merging #300 (Spartaaa)
Merging #301