Really REALLY dirty route matching
Merge pull request #6 from auser/upstream/api

Really REALLY dirty route matching