De-duplicate multiple name hits for same resource (fixes #1)
Merge branch 'master' into gh-pages
Recompile