diff --git a/lib/pico.php b/lib/pico.php
index 6f3f937..2446d71 100644
--- a/lib/pico.php
+++ b/lib/pico.php
@@ -162,8 +162,20 @@ class Pico {
 				$headers[$field] = trim($matches[2][$m]);
 			}
 		}
-
-		if(isset($headers['date'])) $headers['date_formatted'] = date($config['date_format'], strtotime($headers['date']));
+		
+		if($headers['date']) $headers['date_formatted'] = date($config['date_format'], strtotime($headers['date']));
+		
+		if(empty($headers['title'])){
+			preg_match('/^(.+?)[ ]*\n(=+|-+)[ ]*\n+/imu',$content,$matches);
+			if(count($matches) > 0){
+					$headers['title'] = $matches[1];
+			}else{
+				preg_match('/^\#{1}([^\#].*)$/imu',$content,$matches);
+				if(count($matches) > 0){
+					$headers['title'] = $matches[1];
+				}
+			}
+		}
 
 		return $headers;
 	}
@@ -340,4 +352,3 @@ class Pico {
 
 }
 
-// End of file