Handle no entry and spaces
Merge branch 'master' into gh-pages