diff --git a/bin/hued b/bin/hued
index 560aaba..1b24c3f 100755
--- a/bin/hued
+++ b/bin/hued
@@ -13,7 +13,7 @@
 require "hued"
 
 # Option parsing
-options = {blink: true}
+options = {}
 opt_parser = OptionParser.new do |opts|
   opts.banner = "Usage: hued [options]"
   opts.separator ""
diff --git a/lib/hued.rb b/lib/hued.rb
index a082c2e..2e0705a 100644
--- a/lib/hued.rb
+++ b/lib/hued.rb
@@ -25,8 +25,14 @@ module Hued
   # FIXME: load scenes as Hued::Scene classes
   Scenes = {}
 
+  DefaultConfig = { blink: true,
+                    config_dir: "config",
+                    hue_debug: false,
+                    debug: false }
+
+
   def configure(options)
-    @config = options
+    @config = DefaultConfig.merge(options)
 
     # Set up the logger
     @log = Logger.new($stdout)