Fix a few typos
Merge pull request #613 from rubenk/master

Fix a few typos