flynn/flynn — pull request #346 by archSeer (2014-10-20 15:13:14+00:00)
Title: Router enhancements

Since #189 cannot be merged yet, this is a cherry-pick of router enhancements.