fixing a few typos
Merge pull request #212 from yoshi-taka/fix-typo

fixing a few typos
Merge remote-tracking branch 'upstream/master'