diff --git a/pyreadline/modes/basemode.py b/pyreadline/modes/basemode.py
index c5b118a..0ff07e8 100644
--- a/pyreadline/modes/basemode.py
+++ b/pyreadline/modes/basemode.py
@@ -31,6 +31,7 @@ class BaseMode(object):
         self.completer_delims = u" \t\n\"\\'`@$><=;|&{("
         self.show_all_if_ambiguous = u'off'
         self.mark_directories = u'on'
+        self.complete_filesystem = u'on'
         self.completer = None
         self.begidx = 0
         self.endidx = 0
@@ -203,7 +204,8 @@ class BaseMode(object):
                 else:
                     break
             log(u'text completions=<%s>' % map(ensure_unicode, completions))
-        if not completions:
+        if (self.complete_filesystem == "on") and not completions:
+            print "HEJ"
             # get the filename to complete
             while self.begidx > 0:
                 self.begidx -= 1
diff --git a/pyreadline/rlmain.py b/pyreadline/rlmain.py
index 43b4ac3..62e341c 100644
--- a/pyreadline/rlmain.py
+++ b/pyreadline/rlmain.py
@@ -325,6 +325,9 @@ class BaseReadline(object):
         def completer_delims(delims):
             self.mode.completer_delims = delims
         
+        def complete_filesystem(delims):
+            self.mode.complete_filesystem = delims.lower()
+        
         def debug_output(on, filename=u"pyreadline_debug_log.txt"): #Not implemented yet
             if on in [u"on", u"on_nologfile"]:
                 self.debug=True
@@ -367,6 +370,7 @@ class BaseReadline(object):
                u"mark_directories":mark_directories,
                u"show_all_if_ambiguous":show_all_if_ambiguous,
                u"completer_delims":completer_delims,
+               u"complete_filesystem":complete_filesystem,
                u"debug_output":debug_output,
                u"history_filename":sethistoryfilename,
                u"history_length":sethistorylength,