Merge pull request #154 from jrblevin/imenu-with-metadata