finer grain matching for func decl and operators
Merge pull request #29 from jboelter/master

finer grain matching for func decl and operators