diff --git a/composer.json b/composer.json
index 3588d01..0addc84 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,8 @@
       "lib/HTTPCurl.php",
       "lib/HTTPStream.php",
       "lib/HTTP.php",
-      "lib/Formats/Mf2.php"
+      "lib/Formats/Mf2.php",
+      "lib/Formats/HTMLPurifier_AttrDef_HTML_Microformats2.php"
     ]
   },
   "autoload-dev": {
diff --git a/lib/Formats/HTMLPurifier_AttrDef_HTML_Microformats2.php b/lib/Formats/HTMLPurifier_AttrDef_HTML_Microformats2.php
new file mode 100644
index 0000000..5d19c8e
--- /dev/null
+++ b/lib/Formats/HTMLPurifier_AttrDef_HTML_Microformats2.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Allows Microformats2 classes but rejects any others
+ */
+class HTMLPurifier_AttrDef_HTML_Microformats2 extends HTMLPurifier_AttrDef_HTML_Nmtokens
+{
+    /**
+     * @param string $string
+     * @param HTMLPurifier_Config $config
+     * @param HTMLPurifier_Context $context
+     * @return bool|string
+     */
+    protected function split($string, $config, $context)
+    {
+        // really, this twiddle should be lazy loaded
+        $name = $config->getDefinition('HTML')->doctype->name;
+        if ($name == "XHTML 1.1" || $name == "XHTML 2.0") {
+            return parent::split($string, $config, $context);
+        } else {
+            return preg_split('/\s+/', $string);
+        }
+    }
+
+    /**
+     * @param array $tokens
+     * @param HTMLPurifier_Config $config
+     * @param HTMLPurifier_Context $context
+     * @return array
+     */
+    protected function filter($tokens, $config, $context)
+    {
+        $ret = array();
+        foreach ($tokens as $token) {
+            if(preg_match('/^([hpue]|dt)-.+/', $token)) {
+                $ret[] = $token;
+            }
+        }
+        return $ret;
+    }
+}
diff --git a/lib/Formats/Mf2.php b/lib/Formats/Mf2.php
index a1797ed..11a7bf8 100644
--- a/lib/Formats/Mf2.php
+++ b/lib/Formats/Mf2.php
@@ -39,13 +39,7 @@ class Mf2 {
 
   private static function parseHEntry($mf2, $http) {
     $data = [
-      'type' => 'entry',
-      'author' => [
-        'type' => 'card',
-        'name' => null,
-        'url' => null,
-        'photo' => null
-      ]
+      'type' => 'entry'
     ];
     $refs = [];
 
@@ -119,7 +113,7 @@ class Mf2 {
       $contentCompare = preg_replace('/\s/','',trim($textContent));
 
       // Check if the name is a prefix of the content
-      if(strpos($contentCompare, $nameCompare) === 0) {
+      if($contentCompare && $nameCompare && strpos($contentCompare, $nameCompare) === 0) {
         $name = null;
       }
     }
@@ -136,7 +130,8 @@ class Mf2 {
       }
     }
 
-    $data['author'] = self::findAuthor($mf2, $item, $http);
+    if($author = self::findAuthor($mf2, $item, $http))
+      $data['author'] = $author;
 
     $response = [
       'data' => $data
@@ -291,6 +286,9 @@ class Mf2 {
 
     }
 
+    if(!$author['name'] && !$author['photo'] && !$author['url'])
+      return null;
+
     return $author;
   }
 
@@ -312,6 +310,7 @@ class Mf2 {
       'time',
       'blockquote',
       'pre',
+      'p',
       'h1',
       'h2',
       'h3',
@@ -329,6 +328,8 @@ class Mf2 {
         'datetime' => 'Text'
       ]
     );
+    // Override the allowed classes to only support Microformats2 classes
+    $def->manager->attrTypes->set('Class', new \HTMLPurifier_AttrDef_HTML_Microformats2());
     $purifier = new HTMLPurifier($config);
     return $purifier->purify($html);
   }
diff --git a/tests/SanitizeTest.php b/tests/SanitizeTest.php
index 8db456a..c123ee0 100644
--- a/tests/SanitizeTest.php
+++ b/tests/SanitizeTest.php
@@ -43,6 +43,7 @@ class SanitizeTest extends PHPUnit_Framework_TestCase {
     $this->assertContains('<blockquote>Blockquote tags are okay</blockquote>', $html);
     $this->assertContains('<pre>preformatted text is okay too', $html, '<pre> missing');
     $this->assertContains('for code examples and such</pre>', $html, '<pre> missing');
+    $this->assertContains('<p>Paragraph tags are allowed</p>', $html, '<p> missing');
     $this->assertContains('<h1>One</h1>', $html, '<h1> missing');
     $this->assertContains('<h2>Two</h2>', $html, '<h2> missing');
     $this->assertContains('<h3>Three</h3>', $html, '<h3> missing');
@@ -61,11 +62,23 @@ class SanitizeTest extends PHPUnit_Framework_TestCase {
     $html = $data['data']['content']['html'];
 
     $this->assertEquals('entry', $data['data']['type']);
-    $this->assertNotContains('<p>', $html);
     $this->assertNotContains('<script>', $html);
     $this->assertNotContains('<style>', $html);
     $this->assertNotContains('visiblity', $html); // from the CSS
     $this->assertNotContains('alert', $html); // from the JS
   }
 
+  public function testAllowsMF2Classes() {
+    $url = 'http://sanitize.example/entry-with-mf2-classes';
+    $response = $this->parse(['url' => $url]);
+
+    $body = $response->getContent();
+    $this->assertEquals(200, $response->getStatusCode());
+    $data = json_decode($body, true);
+    $html = $data['data']['content']['html'];
+
+    $this->assertEquals('entry', $data['data']['type']);
+    $this->assertContains('<h2 class="p-name">Hello World</h2>', $html);
+  }
+
 }
diff --git a/tests/data/sanitize.example/entry-with-mf2-classes b/tests/data/sanitize.example/entry-with-mf2-classes
new file mode 100644
index 0000000..8579def
--- /dev/null
+++ b/tests/data/sanitize.example/entry-with-mf2-classes
@@ -0,0 +1,17 @@
+HTTP/1.1 200 OK
+Server: Apache
+Date: Wed, 09 Dec 2015 03:29:14 GMT
+Content-Type: text/html; charset=utf-8
+Connection: keep-alive
+
+<html>
+  <head>
+    <title>Test</title>
+  </head>
+  <body class="h-entry">
+    <div class="e-content">
+      <h2 class="p-name header">Hello World</h2>
+      This content has a valid tags that contains microformats classes.
+    </div>
+  </body>
+</html>
diff --git a/tests/data/sanitize.example/entry-with-valid-tags b/tests/data/sanitize.example/entry-with-valid-tags
index 0d1fac5..c5cd235 100644
--- a/tests/data/sanitize.example/entry-with-valid-tags
+++ b/tests/data/sanitize.example/entry-with-valid-tags
@@ -17,6 +17,8 @@ Connection: keep-alive
       <pre>preformatted text is okay too
 for code examples and such</pre>
 
+      <p>Paragraph tags are allowed</p>
+
       <h1>One</h1>
       <h2>Two</h2>
       <h3>Three</h3>