Added option to match non-hydrogen atoms.