Fixed options merging to include target options

* Also updated call to bundle() to use merged object