diff --git a/README.md b/README.md
index b972db0..376ee71 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,23 @@ number of cycles:
      (0.48294318988133728, 0.5), (0.52799626197601901, 0.5), (0.78150280937784777, 0.5),
      (1.102640610792428, 0.5)]
 ```
+
 Not interested in all the decimals? Use *ndigits*:
 ```python
 >>> rainflow.count_cycles(y, ndigits=2)
     [(0.11, 1.5), (0.21, 1.5), (0.37, 0.5), (0.44, 0.5), (0.48, 0.5), (0.53, 0.5),
      (0.78, 0.5), (1.1, 0.5)]
 ```
+
+If you need more detailed output, like cycle lows, highs or means, use `extract_cycles`:
+```python
+>>> for low, high, mult in rainflow.extract_cycles(y):
+...     mean = 0.5 * (high + low)
+...     rng = high - low
+```
+
+Running tests
+-------------
+```
+python -m unittest tests/*.py
+```
diff --git a/rainflow.py b/rainflow.py
index 15545e7..94ba48e 100644
--- a/rainflow.py
+++ b/rainflow.py
@@ -3,9 +3,20 @@
 Implements rainflow cycle counting algorythm for fatigue analysis
 according to section 5.4.4 in ASTM E1049-85 (2011).
 """
-__version__ = "1.0.1"
+__version__ = "2.0.0"
 
 from collections import deque, defaultdict
+import functools
+
+
+def get_round_function(ndigits=None):
+    if ndigits is None:
+        def func(x):
+            return x
+    else:
+        def func(x):
+            return round(x, ndigits)
+    return func
 
 
 def reversals(series):
@@ -16,10 +27,10 @@ def reversals(series):
     the first and the last points in the series.
     """
     series = iter(series)
-    
+
     x_last, x = next(series), next(series)
     d_last = (x - x_last)
-    
+
     for x_next in series:
         if x_next == x:
             continue
@@ -30,15 +41,29 @@ def reversals(series):
         d_last = d_next
 
 
+def _sort_lows_and_highs(func):
+    "Decorator for extract_cycles"
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        for low, high, mult in func(*args, **kwargs):
+            if low < high:
+                yield low, high, mult
+            else:
+                yield high, low, mult
+    return wrapper
+
 
+@_sort_lows_and_highs
 def extract_cycles(series):
     """
-    Returns two lists: the first one containig full cycles and the second
-    containing one-half cycles. The cycles are extracted from the iterable
-    *series* according to section 5.4.4 in ASTM E1049 (2011).
+    A generator function which extracts cycles from the iterable *series*
+    according to section 5.4.4 in ASTM E1049 (2011).
+
+    The generator produces tuples (low, high, mult), where low and high
+    define cycle amplitude and mult equals to 1.0 for full cycles and 0.5
+    for half cycles.
     """
     points = deque()
-    full, half = [], []
 
     for x in reversals(series):
         points.append(x)
@@ -53,11 +78,11 @@ def extract_cycles(series):
             elif len(points) == 3:
                 # Y contains the starting point
                 # Count Y as one-half cycle and discard the first point
-                half.append(Y)
+                yield points[-3], points[-2], 0.5
                 points.popleft()
             else:
                 # Count Y as one cycle and discard the peak and the valley of Y
-                full.append(Y)
+                yield points[-3], points[-2], 1.0
                 last = points.pop()
                 points.pop()
                 points.pop()
@@ -65,10 +90,8 @@ def extract_cycles(series):
     else:
         # Count the remaining ranges as one-half cycles
         while len(points) > 1:
-            half.append(abs(points[-2] - points[-1]))
+            yield points[-2], points[-1], 0.5
             points.pop()
-    return full, half
-
 
 
 def count_cycles(series, ndigits=None):
@@ -79,18 +102,10 @@ def count_cycles(series, ndigits=None):
     using the extract_cycles function. If *ndigits* is given the cycles
     will be rounded to the given number of digits before counting.
     """
-    full, half = extract_cycles(series)
-    
-    # Round the cycles if requested
-    if ndigits is not None:
-        full = (round(x, ndigits) for x in full)
-        half = (round(x, ndigits) for x in half)
-    
-    # Count cycles
     counts = defaultdict(float)
-    for x in full:
-        counts[x] += 1.0
-    for x in half:
-        counts[x] += 0.5
-    
+    round_ = get_round_function(ndigits)
+
+    for low, high, mult in extract_cycles(series):
+        delta = round_(abs(high - low))
+        counts[delta] += mult
     return sorted(counts.items())
diff --git a/setup.py b/setup.py
index 46c872f..4f4daba 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,10 @@
 from distutils.core import setup
 
 LICENSE = open("LICENSE").read()
-LONG_DESCRIPTION = open("README.md").read()    
+LONG_DESCRIPTION = open("README.md").read()
 
 setup(name='rainflow',
-      version='1.0.1',
+      version='2.0.0',
       author='Piotr Janiszewski',
       author_email='i.am.like.me@gmail.com',
       url='https://github.com/iamlikeme/rainflow/',

Feature: Rainflow Matrix
I would love to see the method described [here](https://community.plm.automation.siemens.com/t5/Testing-Knowledge-Base/Rainflow-Counting/ta-p/383093) in this library.

Is there a chance this could happen? :)
diff --git a/tests/test_rainflow.py b/tests/test_rainflow.py
index ae71ec3..d2cd9eb 100644
--- a/tests/test_rainflow.py
+++ b/tests/test_rainflow.py
@@ -1,20 +1,25 @@
 import unittest, rainflow, random, itertools
 
+
 class TestRainflowCounting(unittest.TestCase):
     # Load series and corresponding cycle counts from ASTM E1049-85
     series = [0, -2, 1, -3, 5, -1, 3, -4, 4, -2, 0]
     cycles = [(3, 0.5), (4, 1.5), (6, 0.5), (8, 1.0), (9, 0.5)]
-    
+
+    def test_lows_and_highs_sorted(self):
+        self.assertTrue(all(
+            low <= high
+            for low, high, mult in rainflow.extract_cycles(self.series)
+        ))
+
     def test_rainflow_counting(self):
         self.assertEqual(rainflow.count_cycles(self.series), self.cycles)
-    
-    
+
     def test_rainflow_ndigits(self):
         series = [x + 0.01 * random.random() for x in self.series]
         self.assertNotEqual(rainflow.count_cycles(series), self.cycles)
         self.assertEqual(rainflow.count_cycles(series, ndigits=1), self.cycles)
-	
+
     def test_series_with_zero_derivatives(self):
     	series = itertools.chain(*([x, x] for x in self.series))
     	self.assertEqual(rainflow.count_cycles(series), self.cycles)
-    	

pip install -e .
parse_log_pytest
requirements.txt
pytest
3.9
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
exceptiongroup==1.2.2
iniconfig==2.1.0
packaging==24.2
pluggy==1.5.0
pytest==8.3.5
-e git+https://github.com/iamlikeme/rainflow.git@8e961750baa61b12582b108677ff463b5c9cbf99#egg=rainflow
tomli==2.2.1

name: rainflow
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.4.4=h6a678d5_1
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=3.0.16=h5eee18b_0
  - pip=25.0=py39h06a4308_0
  - python=3.9.21=he870216_1
  - readline=8.2=h5eee18b_0
  - setuptools=75.8.0=py39h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - tzdata=2025a=h04d1e81_0
  - wheel=0.45.1=py39h06a4308_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - exceptiongroup==1.2.2
      - iniconfig==2.1.0
      - packaging==24.2
      - pluggy==1.5.0
      - pytest==8.3.5
      - tomli==2.2.1
prefix: /opt/conda/envs/rainflow

tests/test_rainflow.py::TestRainflowCounting::test_lows_and_highs_sorted
tests/test_rainflow.py::TestRainflowCounting::test_rainflow_counting tests/test_rainflow.py::TestRainflowCounting::test_rainflow_ndigits tests/test_rainflow.py::TestRainflowCounting::test_series_with_zero_derivatives
rainflow.py README.md setup.py
rainflow.py README.md setup.py