Merge pull request #21 from bobolinks-2014/routing

Routing