Fix typos and errors
Merge pull request #755 from hayk/patch-2

Fix typos and errors