Features #16 routing problems Fixes #16