diff --git a/.document b/.document
new file mode 100644
index 0000000..dd2904d
--- /dev/null
+++ b/.document
@@ -0,0 +1,5 @@
+README.md
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE
diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..8c18f1a
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,2 @@
+--format documentation
+--color
diff --git a/bin/twhois b/bin/twhois
index dcc6735..57a30a9 100755
--- a/bin/twhois
+++ b/bin/twhois
@@ -26,10 +26,11 @@ if ARGV.size > 0
         puts "  Private Account: #{user.protected ? "Yes" : "No"}"
       else
         puts "@#{username}:"
-        puts "  Not Found"
+        puts "  Error: Not Found"
       end
     rescue Twhois::InvalidUsername => e
-      puts "\"#{username}\" is not a valid Twitter username"
+      puts "@#{username}:"
+      puts "  Error: Invalid Username"
     end
   end
 else
diff --git a/lib/twhois/version.rb b/lib/twhois/version.rb
index 6e32a10..b907db5 100644
--- a/lib/twhois/version.rb
+++ b/lib/twhois/version.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Twhois
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end