Merge pull request #17 from JoahG/master

Adds Org search 404 handling