Merge pull request #33 from tomhughes/routing