Fixed typos
Merge pull request #262 from pborreli/typos

Fixed typos
fix links to code_style section
Merge pull request #264 from simon-weber/fix-codestyle-typo

Fix typo/links to code_style section
merge upstream