diff --git a/src/lib.rs b/src/lib.rs
index 0c50637..3de1657 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -474,7 +474,7 @@ pub fn counter_config_for_lang<'a>(lang: Lang) -> (SmallVec<[&'a str; 3]>, Small
         Perl   => (smallvec!["#"], smallvec![("=pod", "=cut")]),
         Puppet => (smallvec!["#"], smallvec![]),
         Pyret  => (smallvec!["#"], smallvec![("#|", "|#")]),
-        Python => (smallvec!["#"], smallvec![("'''", "'''")]),
+        Python => (smallvec!["#"], smallvec![("'''", "'''"), ("\"\"\"", "\"\"\"")]),
         Ruby   => (smallvec!["#"], smallvec![("=begin", "=end")]),
         Sql    => (smallvec!["--"], smallvec![("/*", "*/")]),
 
@@ -660,7 +660,7 @@ pub fn count(filepath: &str) -> Count {
                     }
                 }
 
-                if pos + start_len <= line_len && &line[pos..pos + start_len] == *start {
+                if pos + start_len <= line_len && &line[pos..pos + start_len] == *start  && (start != end || multi_stack.is_empty()) {
                     pos += start_len;
                     multi_stack.push(*multi);
                     continue;
diff --git a/tests/count.rs b/tests/count.rs
index b444fb9..5f0c726 100644
--- a/tests/count.rs
+++ b/tests/count.rs
@@ -210,3 +210,19 @@ test_count![NESTED_HASKELL,
             nested_haskell_comment,
             nested_haskell_blank,
             nested_haskell_lines];
+
+const PYTHON: &'static str = "tests/data/test.py";
+const PYTHON_EXPECTED: Count = Count {
+    code: 3,
+    blank: 1,
+    comment: 6,
+    lines: 10,
+};
+test_count![PYTHON,
+            PYTHON_EXPECTED,
+            python_count,
+            python_code,
+            python_comment,
+            python_blank,
+            python_lines];
+
diff --git a/tests/data/test.py b/tests/data/test.py
new file mode 100644
index 0000000..10aacef
--- /dev/null
+++ b/tests/data/test.py
@@ -0,0 +1,10 @@
+'''
+This is a module docstring
+'''
+a = 1
+b = 2
+c = 3
+"""
+This is a module docstring
+"""
+