diff --git a/influx_line_protocol/metric.py b/influx_line_protocol/metric.py
index dd96e5f..e8b06eb 100644
--- a/influx_line_protocol/metric.py
+++ b/influx_line_protocol/metric.py
@@ -10,20 +10,37 @@ class Metric(object):
         self.timestamp = timestamp
 
     def add_tag(self, name, value):
-        if ' ' in str(value):
-            value = value.replace(' ', '\\ ')
-        self.tags[name] = value
+        self.tags[str(name)] = str(value)
 
     def add_value(self, name, value):
-        self.values[name] = self.__parse_value(value)
+        self.values[str(name)] = value
 
     def __str__(self):
-        protocol = self.measurement
-        tags = ["%s=%s" % (key.replace(' ', '\\ '), self.tags[key]) for key in self.tags]
+        # Escape measurement manually
+        escaped_measurement = self.measurement.replace(',', '\\,')
+        escaped_measurement = escaped_measurement.replace(' ', '\\ ')
+        protocol = escaped_measurement
+
+        # Create tag strings
+        tags = []
+        for key, value in self.tags.items():
+            escaped_name = self.__escape(key)
+            escaped_value = self.__escape(value)
+
+            tags.append("%s=%s" % (escaped_name, escaped_value))
+
+        # Concatenate tags to current line protocol
         if len(tags) > 0:
             protocol = "%s,%s" % (protocol, ",".join(tags))
 
-        values = ["%s=%s" % (key, self.values[key]) for key in self.values]
+        # Create field strings
+        values = []
+        for key, value in self.values.items():
+            escaped_name = self.__escape(key)
+            escaped_value = self.__parse_value(value)
+            values.append("%s=%s" % (escaped_name, escaped_value))
+
+        # Concatenate fields to current line protocol
         protocol = "%s %s" % (protocol, ",".join(values))
 
         if self.timestamp is not None:
@@ -31,14 +48,27 @@ class Metric(object):
 
         return protocol
 
+    def __escape(self, value, escape_quotes=False):
+        # Escape backslashes first since the other characters are escaped with
+        # backslashes
+        new_value = value.replace('\\', '\\\\')
+        new_value = new_value.replace(' ', '\\ ')
+        new_value = new_value.replace('=', '\\=')
+        new_value = new_value.replace(',', '\\,')
+
+        if escape_quotes:
+            new_value = new_value.replace('"', '\\"')
+
+        return new_value
+
     def __parse_value(self, value):
-        if type(value).__name__ == 'int':
+        if type(value) is int:
             return "%di" % value
 
-        if type(value).__name__ == 'float':
+        if type(value) is float:
             return "%g" % value
 
-        if type(value).__name__ == 'bool':
+        if type(value) is bool:
             return value and "t" or "f"
 
-        return "\"%s\"" % value
+        return "\"%s\"" % self.__escape(value, True)

diff --git a/influx_line_protocol/test_metric.py b/influx_line_protocol/test_metric.py
index 73ae904..d4d323a 100644
--- a/influx_line_protocol/test_metric.py
+++ b/influx_line_protocol/test_metric.py
@@ -15,12 +15,58 @@ class TestMetric(unittest.TestCase):
 
         self.assertEqual("test,tag1=string ", str(metric))
 
+    def test_metric_escape_measurement_spaces(self):
+        metric = Metric("test test")
+        metric.add_value("a", "b")
+
+        self.assertEqual("test\\ test a=\"b\"", str(metric))
+
+    def test_metric_escape_measurement_commas(self):
+        metric = Metric("test,test")
+        metric.add_value("a", "b")
+
+        self.assertEqual("test\\,test a=\"b\"", str(metric))
+
     def test_metric_with_tag_string_space_without_values_and_timestamp(self):
         metric = Metric("test")
         metric.add_tag("tag name", "string with space")
 
         self.assertEqual("test,tag\\ name=string\\ with\\ space ", str(metric))
 
+    def test_metric_escape_tag_and_field_commas(self):
+        metric = Metric("test")
+        metric.add_tag("a,b", "c,d")
+        metric.add_value("x,y", "z")
+
+        self.assertEqual("test,a\\,b=c\\,d x\\,y=\"z\"", str(metric))
+
+    def test_metric_escape_tag_and_field_equals(self):
+        metric = Metric("test")
+        metric.add_tag("a=b", "c=d")
+        metric.add_value("x=y", "z")
+
+        self.assertEqual("test,a\\=b=c\\=d x\\=y=\"z\"", str(metric))
+
+    def test_metric_escape_field_double_quotes(self):
+        metric = Metric("test")
+        metric.add_tag("a\"b", "c\"d")
+        metric.add_value("x\"y", "z\"")
+
+        self.assertEqual("test,a\"b=c\"d x\"y=\"z\\\"\"", str(metric))
+
+    def test_metric_escape_tag_and_field_backslash(self):
+        metric = Metric("test")
+        metric.add_tag("a\\b", "c\\d")
+        metric.add_value("x\\y", "z\\a")
+
+        self.assertEqual("test,a\\\\b=c\\\\d x\\\\y=\"z\\\\a\"", str(metric))
+
+    def test_metric_escape_field_double_quotes_and_backslash(self):
+        metric = Metric("test")
+        metric.add_value("x", "z\\\"")
+
+        self.assertEqual("test x=\"z\\\\\\\"\"", str(metric))
+
     def test_metric_with_tag_value_and_timestamp(self):
         metric = Metric("test")
         metric.add_tag("tag", "string")

needs to properly escape all characters
it only escapes spaces in tag keys. It also needs to escape = and ,

https://docs.influxdata.com/influxdb/v1.7/write_protocols/line_protocol_tutorial/#special-characters
influx_line_protocol/test_metric.py::TestMetric::test_metric_escape_field_double_quotes influx_line_protocol/test_metric.py::TestMetric::test_metric_escape_field_double_quotes_and_backslash influx_line_protocol/test_metric.py::TestMetric::test_metric_escape_measurement_commas influx_line_protocol/test_metric.py::TestMetric::test_metric_escape_measurement_spaces influx_line_protocol/test_metric.py::TestMetric::test_metric_escape_tag_and_field_backslash influx_line_protocol/test_metric.py::TestMetric::test_metric_escape_tag_and_field_commas influx_line_protocol/test_metric.py::TestMetric::test_metric_escape_tag_and_field_equals
influx_line_protocol/test_metric.py::TestMetric::test_metric_multiple_tags_without_values_and_timestamp influx_line_protocol/test_metric.py::TestMetric::test_metric_multiple_values_tags_and_timestamp influx_line_protocol/test_metric.py::TestMetric::test_metric_multiple_values_without_tags_and_timestamp influx_line_protocol/test_metric.py::TestMetric::test_metric_with_tag_string_space_without_values_and_timestamp influx_line_protocol/test_metric.py::TestMetric::test_metric_with_tag_value_and_timestamp influx_line_protocol/test_metric.py::TestMetric::test_metric_without_tags_and_timestamp influx_line_protocol/test_metric.py::TestMetric::test_metric_without_tags_values_and_timestamp influx_line_protocol/test_metric.py::TestMetric::test_metric_without_values_and_timestamp