diff --git a/python/006_ZigZag_Conversion.py b/python/006_ZigZag_Conversion.py
new file mode 100644
index 0000000..ae3c418
--- /dev/null
+++ b/python/006_ZigZag_Conversion.py
@@ -0,0 +1,53 @@
+class Solution(object):
+    # def convert(self, s, numRows):
+    #     """
+    #     :type s: str
+    #     :type numRows: int
+    #     :rtype: str
+    #     """
+    #     ls = len(s)
+    #     if ls <= 1 or numRows == 1:
+    #         return s
+    #     temp_s = []
+    #     for i in range(numRows):
+    #         temp_s.append(['']*(ls / 2))
+    #     inter = numRows - 1
+    #     col, row = 0, 0
+    #     for i, ch in enumerate(s):
+    #         flag = True
+    #         if (i / inter) % 2 == 1:
+    #             # print i
+    #             flag = False
+    #         if flag:
+    #             temp_s[row][col] = ch
+    #             row += 1
+    #         else:
+    #             temp_s[row][col] = ch
+    #             col += 1
+    #             row -= 1
+    #     result = ''
+    #     for i in range(numRows):
+    #         result += ''.join(temp_s[i])
+    #     return result
+
+    def convert(self, s, numRows):
+        # https://leetcode.com/discuss/90908/easy-python-o-n-solution-94%25-with-explanations
+        if numRows == 1:
+            return s
+        # calculate period
+        p = 2 * (numRows - 1)
+        result = [""] * numRows
+        for i in xrange(len(s)):
+            floor = i % p
+            if floor >= p//2:
+                floor = p - floor
+            result[floor] += s[i]
+        return "".join(result)
+
+
+if __name__ == '__main__':
+    # begin
+    s = Solution()
+    print s.convert("PAYPALISHIRING", 3)
+
+