Findlink

Ok, I know.  But (unbelievably) the kids aren't up yet so I grabbed an easy one from the issue list.  
A little cleanup to resolve #182.