diff --git a/Main.hs b/Main.hs
--- a/Main.hs
+++ b/Main.hs
@@ -50,7 +50,7 @@
 --   3. If the archive contains multiple items, they are unarchived in a
 --      directory named after the original file.
 
-version    = "2.0.0"
+version    = "2.0.1"
 copyright  = "2009-2012"
 unaSummary = "una v" ++ version ++ ", (C) John Wiegley " ++ copyright
 
@@ -59,34 +59,34 @@
     , force     :: Bool
     , temp      :: FilePath
     , output    :: FilePath
-    , sys_temp  :: Bool
+    , sysTemp   :: Bool
     , test      :: Bool
     , files     :: [FilePath]
     }
     deriving (Data, Typeable, Show, Eq)
 
 una = Una
-    { delete_   = def &= help "Delete the original archive if successful"
-    , force     = def &= name "f" &= help "Overwrite any existing file/dir"
-    , temp      = def &= typDir &=
-                  help "Use DIR as a temp directory, instead of current"
-    , output    = def &= typDir &= name "o" &=
-                  help "Unarchive to DIR instead of archive's directory"
-    , sys_temp  = def &= name "T" &=
-                  help "Use the system's temp directory (typically /tmp)"
-    , test      = def &= explicit &= name "test" &=
-                  help "Extract, throw away resulting file(s), set error code"
-    , files     = def &= args &= typ "FILE..."
+    { delete_ = def &= help "Delete the original archive if successful"
+    , force   = def &= name "f" &= help "Overwrite any existing file/dir"
+    , temp    = def &= typDir &=
+                help "Use DIR as a temp directory, instead of current"
+    , output  = def &= typDir &= name "o" &=
+                help "Unarchive to DIR instead of archive's directory"
+    , sysTemp = def &= name "T" &=
+                help "Use the system's temp directory (typically /tmp)"
+    , test    = def &= explicit &= name "test" &=
+                help "Extract, throw away resulting file(s), set error code"
+    , files   = def &= args &= typ "FILE..."
     } &=
     summary unaSummary &=
     program "una" &=
-    helpArg [explicit, name "h"] &=
     help "Universal recursive unarchiver/decoder/decompressor tool"
 
 
 main :: IO ()
 main = do
-  opts <- cmdArgs una
+  mainArgs <- getArgs
+  opts <- (if null mainArgs then withArgs ["--help"] else id) (cmdArgs una)
 
   --when (null (files opts)) $ cmdArgsApply cmdArgsHelp
 
@@ -516,7 +516,7 @@
 
 workingDirectory :: IO FilePath
 workingDirectory = do
-  sysp <- getOption sys_temp
+  sysp <- getOption sysTemp
   if sysp
     then getTemporaryDirectory
     else do dir <- getOption temp
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-una: Universal un-archiver (mainly tested on Mac OS X for now)
+# una: Universal un-archiver
 
 Version 1.0, by John Wiegley <johnw@newartisans.com>
 
@@ -7,20 +7,21 @@
 deal with.
 
 Optional dependencies:
-  StuffIt Expander (free, expander-only version)
-  MacPorts: unarj, unrar, lha, p7zip, cabextract
 
-.h2 Usage
+- StuffIt Expander (free, expander-only version)
+- MacPorts: unarj, unrar, lha, p7zip, cabextract
 
-una [OPTION] ARCHIVE...
+## Usage
 
-If no OPTION is specified, the default action is to extract the archive's
-contents into the current directory.
+    una [OPTION] ARCHIVE...
 
-Options:
-  -h, --help        show help
-  -d, --delete      delete the archive if sucessfully extracted
-  -f, --overwrite   overwrite any existing file
+    If no OPTION is specified, the default action is to extract the archive's
+    contents into the current directory.
+
+    Options:
+      -h, --help        show help
+      -d, --delete      delete the archive if sucessfully extracted
+      -f, --overwrite   overwrite any existing file
 
 This script is also smart about unarchiving:
 
diff --git a/una.cabal b/una.cabal
--- a/una.cabal
+++ b/una.cabal
@@ -1,6 +1,6 @@
 Name: una
 
-Version:  2.0.0
+Version:  2.0.1
 Synopsis: Universal un-archiver utility
 
 Description: A simple universal unarchiving utility.  Just point it at any