Typo fix
Merge remote-tracking branch 'upstream/master' into enh-osx
Make SW_BUFFER_SIZE to be 2K on OS X
Merge pull request #122 from bixuehujin/enh-osx

Make SW_BUFFER_SIZE to be 2K on OS X & Typo fix