3 files changed, 6 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Parsing.hs b/src/Text/Pandoc/Parsing.hs
index 2709a1b0f..cf46bf216 100644
--- a/src/Text/Pandoc/Parsing.hs
+++ b/src/Text/Pandoc/Parsing.hs
@@ -415,10 +415,13 @@ tableWith :: GenParser Char ParserState ([[Block]], [Alignment], [Int])
           -> GenParser Char ParserState [Inline]
           -> GenParser Char ParserState Block
 tableWith headerParser rowParser lineParser footerParser captionParser = try $ do
+    caption' <- option [] captionParser
     (heads, aligns, indices) <- headerParser
     lines' <- rowParser indices `sepEndBy` lineParser
     footerParser
-    caption <- option [] captionParser
+    caption <- if null caption'
+                  then option [] captionParser
+                  else return caption'
     state <- getState
     let numColumns = stateColumns state
     let widths = widthsFromIndices numColumns indices
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 96e0f597f..6895de06b 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -775,7 +775,7 @@ multilineRow indices = do
 tableCaption :: GenParser Char ParserState [Inline]
 tableCaption = try $ do
   skipNonindentSpaces
-  string "Table:"
+  string ":" <|> string "Table:"
   result <- many1 inline
   blanklines
   return $ normalizeSpaces result
diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs
index 238405337..d72fb5eb5 100644
--- a/src/Text/Pandoc/Writers/Markdown.hs
+++ b/src/Text/Pandoc/Writers/Markdown.hs
@@ -239,7 +239,7 @@ blockToMarkdown opts (Table caption aligns widths headers rows) =  do
   caption' <- inlineListToMarkdown opts caption
   let caption'' = if null caption
                      then empty
-                     else text "" $+$ (text "Table: " <> caption')
+                     else text "" $+$ (text ": " <> caption')
   headers' <- mapM (blockListToMarkdown opts) headers
   let alignHeader alignment = case alignment of
                                 AlignLeft    -> leftAlignBlock