fix typo
Merge branch 'issue17' into gh-pages