diff --git a/etc/_git-now b/etc/_git-now
index 3217bd2..8920f18 100644
--- a/etc/_git-now
+++ b/etc/_git-now
@@ -12,19 +12,21 @@
 
 __git-now-add ()
 {
-  local curcontext="$curcontext" state line
+  local curcontext="$curcontext" state line expl
   typeset -A opt_args
 
-  _arguments -s : \
-    '-n[do not actually add files; only show which ones would be added]'\
-    '-v[show files as they are added]'\
-    '-f[allow adding otherwise ignored files]'\
-    '-i[add contents interactively to index]'\
-    '-p[like -i but go directly into patch mode for specified files]'\
-    '-e[open diff against index in editor]'\
-    '-u[update only files git already knows about]'\
-    '-N[record only that path will be added later]'\
-    '-s[generate diffstat instead of patch]'\
+  _arguments -s :\
+    '(--all)-n[do not actually add files; only show which ones would be added]'\
+    '(--all)-v[show files as they are added]'\
+    '(-f --force --all)'{-f,--force}'[allow adding otherwise ignored files]'\
+    '(-i --interactive --all)'{-i,--interactive}'[add contents interactively to index]'\
+    '(-p --path --all)'{-p,--path}'[like -i but go directly into patch mode for specified files]'\
+    '(-e --edit --all)'{-e,--edit}'[open diff against index in editor]'\
+    '(-u --update --all)'{-u,--update}'[update only files git already knows about]'\
+    '(-N --intent-to-add --all)'{-N,--intent-to-add}'[record only that path will be added later]'\
+    '(-s --stat)'{-s,--stat}'[generate diffstat instead of patch]'\
+    '--push[push to remote after performing finish]'\
+    '(-n -v -f --force -i --interactive -p --path -e --edit -u --update -N --intent-to-add)--all[add --update and add .]'\
     ':filepattern:_files'
 }
 
@@ -63,7 +65,7 @@ __git_command_successful () {
   return 0
 }
 
-local curcontext="$curcontext" state line
+local curcontext="$curcontext" state line expl
 typeset -A opt_args
 
 _arguments -C \
@@ -93,7 +95,7 @@ case $state in
 
       (rebase)
         _arguments \
-          '-m[limit git-now commits by your name]'\
+          '(-m --mine)'{-m,--mine}'[limit git-now commits by your name]'\
           ':branch-name:__git_branch_names'
         ;;
 
@@ -104,9 +106,9 @@ case $state in
 
       (grep)
         _arguments -s : \
-          '-p[generate diff in patch format]'\
-          '-s[generate diffstat instead of patch]'\
-          '-m[limit git-now commits by your name]'\
+          '(-p --path)'{-p,--patch}'[generate diff in patch format]'\
+          '(-s --stat)'{-s,--stat}'[generate diffstat instead of patch]'\
+          '(-m --mine)'{-m,--mine}'[limit git-now commits by your name]'\
           ':branch-name:__git_branch_names'
         ;;
       (*)
diff --git a/etc/git-now-completion.zsh b/etc/git-now-completion.zsh
index f46df74..3af8c7d 100644
--- a/etc/git-now-completion.zsh
+++ b/etc/git-now-completion.zsh
@@ -20,7 +20,7 @@
 
 _git-now ()
 {
-  local curcontext="$curcontext" state line
+  local curcontext="$curcontext" state line expl
   typeset -A opt_args
 
   _arguments -C \
@@ -50,7 +50,7 @@ _git-now ()
 
         (rebase)
           _arguments \
-            '-m[limit git-now commits by your name]'\
+            '(-m --mine)'{-m,--mine}'[limit git-now commits by your name]'\
             ':branch-name:__git_branch_names'
           ;;
 
@@ -61,9 +61,9 @@ _git-now ()
 
         (grep)
           _arguments -s : \
-            '-p[generate diff in patch format]'\
-            '-s[generate diffstat instead of patch]'\
-            '-m[limit git-now commits by your name]'\
+            '(-p --path)'{-p,--patch}'[generate diff in patch format]'\
+            '(-s --stat)'{-s,--stat}'[generate diffstat instead of patch]'\
+            '(-m --mine)'{-m,--mine}'[limit git-now commits by your name]'\
             ':branch-name:__git_branch_names'
           ;;
         (*)
@@ -76,19 +76,21 @@ _git-now ()
 
 __git-now-add ()
 {
-  local curcontext="$curcontext" state line
+  local curcontext="$curcontext" state line expl
   typeset -A opt_args
 
-  _arguments -s : \
-    '-n[do not actually add files; only show which ones would be added]'\
-    '-v[show files as they are added]'\
-    '-f[allow adding otherwise ignored files]'\
-    '-i[add contents interactively to index]'\
-    '-p[like -i but go directly into patch mode for specified files]'\
-    '-e[open diff against index in editor]'\
-    '-u[update only files git already knows about]'\
-    '-N[record only that path will be added later]'\
-    '-s[generate diffstat instead of patch]'\
+  _arguments -s :\
+    '(--all)-n[do not actually add files; only show which ones would be added]'\
+    '(--all)-v[show files as they are added]'\
+    '(-f --force --all)'{-f,--force}'[allow adding otherwise ignored files]'\
+    '(-i --interactive --all)'{-i,--interactive}'[add contents interactively to index]'\
+    '(-p --path --all)'{-p,--path}'[like -i but go directly into patch mode for specified files]'\
+    '(-e --edit --all)'{-e,--edit}'[open diff against index in editor]'\
+    '(-u --update --all)'{-u,--update}'[update only files git already knows about]'\
+    '(-N --intent-to-add --all)'{-N,--intent-to-add}'[record only that path will be added later]'\
+    '(-s --stat)'{-s,--stat}'[generate diffstat instead of patch]'\
+    '--push[push to remote after performing finish]'\
+    '(-n -v -f --force -i --interactive -p --path -e --edit -u --update -N --intent-to-add)--all[add --update and add .]'\
     ':filepattern:_files'
 }
 
diff --git a/git-now.rb b/git-now.rb
index 44330b7..34a3a38 100644
--- a/git-now.rb
+++ b/git-now.rb
@@ -1,17 +1,25 @@
 require 'formula'
 
 class GitNow < Formula
-  url  'https://github.com/iwata/git-now.git', :tag => 'v0.1.0.2'
-  version '0.1.0.2'
+  url  'https://github.com/iwata/git-now.git', :tag => 'v0.1.0.3'
+  version '0.1.0.3'
   head 'https://github.com/iwata/git-now.git', :branch => 'develop'
   homepage 'https://github.com/iwata/git-now'
 
+  def options
+    [['--ln-gnu-getopt', "Link a gnu-getopt formula"]]
+  end
+
   # for longopt
-  depends_on 'gnu-getopt'
+  if ARGV.include? '--ln-gnu-getopt'
+    depends_on 'gnu-getopt'
+  end
 
   def install
     system "make", "prefix=#{prefix}", "install"
-    #system "brew ln gnu-getopt"
+    if ARGV.include? '--ln-gnu-getopt'
+      system "brew ln gnu-getopt"
+    end
   end
 
 end