Merge pull request #14 from tomhughes/routing