diff --git a/src/index.js b/src/index.js
index 46c7336..9573566 100644
--- a/src/index.js
+++ b/src/index.js
@@ -22,13 +22,15 @@ class Remarkable extends React.Component {
   }
 
   content() {
+    var Wrapper = this.props.contentWrapper;
+
     if (this.props.source) {
-      return <span dangerouslySetInnerHTML={{ __html: this.renderMarkdown(this.props.source) }} />;
+      return <Wrapper dangerouslySetInnerHTML={{ __html: this.renderMarkdown(this.props.source) }} />;
     }
     else {
       return React.Children.map(this.props.children, child => {
         if (typeof child === 'string') {
-          return <span dangerouslySetInnerHTML={{ __html: this.renderMarkdown(child) }} />;
+          return <Wrapper dangerouslySetInnerHTML={{ __html: this.renderMarkdown(child) }} />;
         }
         else {
           return child;
@@ -48,6 +50,7 @@ class Remarkable extends React.Component {
 
 Remarkable.defaultProps = {
   container: 'div',
+  contentWrapper: 'span',
   options: {},
 };