lib/papermill/papermill.rb in papermill-1.1.2 vs lib/papermill/papermill.rb in papermill-1.1.3

@@ -4,10 +4,10 @@
   def self.included(base)
     base.extend(ClassMethods)
   end
   
   def self.options
-    defined?(OPTIONS) ? OPTIONS : {}
+    @options ||= BASE_OPTIONS.deep_merge(defined?(OPTIONS) ? OPTIONS : {})
   end
   
 
   module ClassMethods
     attr_reader :papermill_associations