Add additional option support
Work around bug in filemapper?
Merge pull request #1 from dblessing/select_file_bug

Work around bug in filemapper?
Merge pull request #2 from dblessing/route_selector_support

Add additional option support
Merge conflicts