remove troublesome space(man)
Merge branch 'master' into gh-pages