diff --git a/compressor/__init__.py b/compressor/__init__.py
index 248bbe3..57515eb 100644
--- a/compressor/__init__.py
+++ b/compressor/__init__.py
@@ -152,7 +152,10 @@ class Compressor(object):
         return render_to_string(self.template_name, context)
 
     def output_inline(self):
-        return render_to_string(self.template_name_inline, {'content': settings.COMPRESS and self.combined or self.concat()})
+        context = {'content': settings.COMPRESS and self.combined or self.concat()}
+        if hasattr(self, 'extra_context'):
+            context.extend(self.extra_context)
+        return render_to_string(self.template_name_inline, context)
 
 class CssCompressor(Compressor):
 
diff --git a/compressor/templates/compressor/css_inline.html b/compressor/templates/compressor/css_inline.html
index 83253f8..ae64fa6 100644
--- a/compressor/templates/compressor/css_inline.html
+++ b/compressor/templates/compressor/css_inline.html
@@ -1 +1 @@
-<style type="text/css">{{ content }}</style>
\ No newline at end of file
+<style type="text/css"{% if media %} media="{{ media }}"{% endif %}>{{ content|safe }}</style>
\ No newline at end of file
diff --git a/compressor/templates/compressor/js_inline.html b/compressor/templates/compressor/js_inline.html
index 6931349..586bd93 100644
--- a/compressor/templates/compressor/js_inline.html
+++ b/compressor/templates/compressor/js_inline.html
@@ -1 +1 @@
-<script type="text/javascript">{{ content }}</script>
\ No newline at end of file
+<script type="text/javascript">{{ content|safe }}</script>
\ No newline at end of file