Clc4 master

Hopefully this merges my fork with the master?