Merge conflicts
Merge conflicts
Fix typo
Merge pull request #3 from dblessing/route_selector_support

Add additional option support