bugfix: update routing table to new route
Merge branch 'fixes' into my_github_master