diff --git a/pelican/bloggenerator.py b/pelican/bloggenerator.py
index 938c508d..ef2bc6b1 100644
--- a/pelican/bloggenerator.py
+++ b/pelican/bloggenerator.py
@@ -224,7 +224,7 @@ def read_settings(filename):
                 context[key] = tempdict[key]
     return context
 
-_METADATA = re.compile(':([a-z]+): (.*)', re.M)
+_METADATA = re.compile(':([a-z]+): (.*)\s', re.M)
 _METADATAS_FIELDS = {'tags': lambda x: x.split(', '),
                      'date': lambda x: get_date(x),
                      'category': lambda x: x,
@@ -242,7 +242,7 @@ def get_date(string):
             return datetime.strptime(string, date_format)
         except ValueError:
             pass
-    raise ValueError("%s is not a valid date" % string)
+    raise ValueError("'%s' is not a valid date" % string)
 
 def parse_metadata(string):
     """Return a dict, containing a list of metadata informations, found
diff --git a/samples/themes/notmyidea/css/main.css b/samples/themes/notmyidea/css/main.css
index e5e00ce0..6e2ce59b 100644
--- a/samples/themes/notmyidea/css/main.css
+++ b/samples/themes/notmyidea/css/main.css
@@ -24,6 +24,10 @@
 		text-align: left;
 	}
 
+article img{
+   float: right;
+}
+
 /* Headings */
 h2 {font-size: 1.571em}	/* 22px */
 h3 {font-size: 1.429em}	/* 20px */
diff --git a/setup.py b/setup.py
index 1c8d28e4..4fcf61f1 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '1.2.2',
+    version = '1.2.3',
     url = 'http://hg.lolnet.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',