Preserve bundle file service options
Merge pull request #41 from tvansteenburgh/use-bundle-options

Preserve bundle file service options