highs, lows and deltas
Merge branch 'dev'