diff --git a/Commands.md b/Commands.md
index 6e57189..1eefefc 100644
--- a/Commands.md
+++ b/Commands.md
@@ -974,7 +974,7 @@ Reference the issues numbers from your bug tracker
 
 ```bash
 $ git stamp Issue FOO-123
-$ git stamp Issue "FOO-456 #close"
+$ git stamp Issue FOO-456 \#close
 
 Fix timezone bug
 
diff --git a/bin/git-stamp b/bin/git-stamp
index 0f48553..1f0877c 100755
--- a/bin/git-stamp
+++ b/bin/git-stamp
@@ -12,7 +12,7 @@ init_variables() {
 
 usage() {
   cat << EOF
-usage: git ${COMMAND} [<options>] <id> [<message>]
+usage: git ${COMMAND} [<options>] <id> [<messages>]
 
 Options:
     -r, --replace    replace all previous stamps with same id
@@ -73,7 +73,7 @@ parse_options() {
   done
   
   ID="$1"
-  MSG="$2"
+  MSG="${@:2}"
 }
 
 
diff --git a/man/git-stamp.1 b/man/git-stamp.1
index ab723fb..207ed90 100644
--- a/man/git-stamp.1
+++ b/man/git-stamp.1
@@ -7,7 +7,7 @@
 \fBgit\-stamp\fR \- Stamp the last commit message
 .
 .SH "SYNOPSIS"
-\fBgit stamp [<options>] <id> [<message>]\fR
+\fBgit stamp [<options>] <id> [<messages>]\fR
 .
 .SH "DESCRIPTION"
 Lets you amend the last commit with a stamp message\.
@@ -59,7 +59,7 @@ Reference the issues numbers from your bug tracker
 .nf
 
 $ git stamp Issue FOO\-123
-$ git stamp Issue "FOO\-456 #close"
+$ git stamp Issue FOO\-456 \e#close
 
 | Fix timezone bug
 |
diff --git a/man/git-stamp.html b/man/git-stamp.html
index 501a9d4..776ee3d 100644
--- a/man/git-stamp.html
+++ b/man/git-stamp.html
@@ -76,7 +76,7 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>git stamp [&lt;options>] &lt;id> [&lt;message>]</code></p>
+<p><code>git stamp [&lt;options>] &lt;id> [&lt;messages>]</code></p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
@@ -105,7 +105,7 @@ The identifier is case insensitive for this replacement
 <p>Reference the issues numbers from your bug tracker</p>
 
 <pre><code>$ git stamp Issue FOO-123
-$ git stamp Issue "FOO-456 #close"
+$ git stamp Issue FOO-456 \#close
 
 | Fix timezone bug
 |
@@ -141,7 +141,7 @@ $ git stamp Issue "FOO-456 #close"
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Damien Tardy-Panis &lt;<a href="&#109;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#100;&#97;&#x6d;&#105;&#x65;&#110;&#x40;&#116;&#x61;&#114;&#100;&#121;&#x70;&#97;&#x64;&#46;&#109;&#x65;" data-bare-link="true">&#100;&#97;&#109;&#105;&#x65;&#x6e;&#64;&#x74;&#97;&#x72;&#x64;&#x79;&#112;&#97;&#100;&#46;&#109;&#x65;</a>&gt;</p>
+<p>Written by Damien Tardy-Panis &lt;<a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#100;&#x61;&#x6d;&#x69;&#101;&#x6e;&#64;&#116;&#x61;&#114;&#100;&#121;&#x70;&#x61;&#x64;&#x2e;&#x6d;&#x65;" data-bare-link="true">&#x64;&#x61;&#x6d;&#x69;&#101;&#110;&#x40;&#116;&#97;&#x72;&#100;&#x79;&#x70;&#97;&#x64;&#x2e;&#x6d;&#x65;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
diff --git a/man/git-stamp.md b/man/git-stamp.md
index ada53fa..d7d8975 100644
--- a/man/git-stamp.md
+++ b/man/git-stamp.md
@@ -3,7 +3,7 @@ git-stamp(1) -- Stamp the last commit message
 
 ## SYNOPSIS
 
-`git stamp [<options>] <id> [<message>]`
+`git stamp [<options>] <id> [<messages>]`
 
 ## DESCRIPTION
 
@@ -30,7 +30,7 @@ Commit message is
 Reference the issues numbers from your bug tracker
 
     $ git stamp Issue FOO-123
-    $ git stamp Issue "FOO-456 #close"
+    $ git stamp Issue FOO-456 \#close
 
     | Fix timezone bug
     |