Merge pull request #24 from zerebubuth/routing-merge