diff --git a/doc/changelog.rst b/doc/changelog.rst
index 3e956c8..7c7ebd3 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -6,6 +6,28 @@ ChangeLog
 :Contact: pluskid@gmail.com
 :Date: 2008-03-22
 
+
+0.6.0b / 2009-07-2x
+===================
+ 
+* Nested placeholders of the type <div${1: id="${2:someid}"}> $0
+* More robust undo/redo support
+* Stacked snippet expansion (snippet in snippet)
+* Transformation on a primary field, the syntax being
+* Validation on field exit
+* Wrapping the region in the exit marker $0 of the snippet
+* Auto-indentation 
+* Easier definition of snippets
+* Customization group
+* Overriding customization variables in snippets
+
+* Fixed `Issue 60
+  <http://code.google.com/p/yasnippet/issues/detail?id=60>`_
+* Fixed `Issue 65
+  <http://code.google.com/p/yasnippet/issues/detail?id=65>`_
+* Fixed `Issue 56
+  <http://code.google.com/p/yasnippet/issues/detail?id=56>`_
+
 0.5.10 / 2009-02-11
 ===================
 
diff --git a/snippets/text-mode/ruby-mode/cls b/snippets/text-mode/ruby-mode/cls
index 4ce8a0b..c86cbfe 100644
--- a/snippets/text-mode/ruby-mode/cls
+++ b/snippets/text-mode/ruby-mode/cls
@@ -2,7 +2,7 @@
 #contributor : hitesh <hitesh.jasani@gmail.com>
 #group : definitions
 # --
-class ${1:$
+class ${1:$$
          (let ((fn (capitalize (file-name-nondirectory
                                  (file-name-sans-extension
                                    (buffer-file-name))))))
diff --git a/yasnippet.el b/yasnippet.el
index 6cc903f..e016197 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -400,7 +400,7 @@ snippet templates")
   "A regexp to *almost* recognize a field")
 
 (defconst yas/multi-dollar-lisp-expression-regexp
-  "$+\\(([^)]*)\\)"
+  "$+[ \t\n]*\\(([^)]*)\\)"
   "A regexp to *almost* recognize a \"$(...)\" expression")
 
 (defconst yas/backquote-lisp-expression-regexp