Merge pull request #135 from n-st/master

Fixed typos.
Merge pull request #137 from n-st/master

Proposed fix for #136