Fixing spectrum matching with multiple elements.
Merge branch 'master' into gh-pages