diff --git a/camelot/plotting.py b/camelot/plotting.py
index a5930c2..473ad13 100644
--- a/camelot/plotting.py
+++ b/camelot/plotting.py
@@ -43,7 +43,13 @@ class PlotMethods(object):
             )
 
         plot_method = getattr(self, kind)
-        return plot_method(table)
+        fig = plot_method(table)
+
+        if filename is not None:
+            fig.savefig(filename)
+            return None
+            
+        return fig
 
     def text(self, table):
         """Generates a plot for all text elements present