fix #15 (patch by @phoenixsong6)
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages