lib/under-os.rb in under-os-1.0.0 vs lib/under-os.rb in under-os-1.1.0

@@ -6,18 +6,16 @@
   def setup(*args, &block)
     config.setup_blocks << proc do |app|
       Dir.glob(File.dirname(__FILE__) + '/**/*.rb').reverse.each do |file|
         app.files.insert(0, file) if file != __FILE__
       end
-    end
 
-    setup_before_under_os *args do |app|
       app.resources_dirs << File.dirname(__FILE__) + "/assets"
       app.resources_dirs << "app/styles/"  if File.exists?("app/styles")
       app.resources_dirs << "app/layouts/" if File.exists?("app/layouts")
 
       app.fonts << "fontawesome-webfont.ttf"
-
-      instance_exec app, &block
     end
+
+    setup_before_under_os *args, &block
   end
 end