sorting out routing mess
Merge pull request #60 from bayendor/routing

sorting out routing mess