Update usage docs and changelog.
diff --git a/Changes.mdown b/Changes.mdown
index 80139a0..76fad86 100644
--- a/Changes.mdown
+++ b/Changes.mdown
@@ -2,6 +2,9 @@
 -----
 Release date: **not yet**
 
+* `git flow feature finish` can now be called without a feature branch
+  name(prefix) argument and will finish the current branch, if on any.
+
 * Various minor bug fixes related to internal argument passing
 
 0.4.1:
diff --git a/git-flow-feature b/git-flow-feature
index 2133330..9da4b0b 100644
--- a/git-flow-feature
+++ b/git-flow-feature
@@ -44,7 +44,7 @@
 usage() {
 	echo "usage: git flow feature [list] [-v]"
 	echo "       git flow feature start [-F] <name> [<base>]"
-	echo "       git flow feature finish [-rFk] <name|nameprefix>"
+	echo "       git flow feature finish [-rFk] [<name|nameprefix>]"
 	echo "       git flow feature publish <name>"
 	echo "       git flow feature track <name>"
 	echo "       git flow feature diff [<name|nameprefix>]"