typos
Merge pull request #414 from marclaporte/2.x

typos