Typo and changelog
Merge pull request #1388 from xispa/typos_changelog

Typo and changelog