Semigroup
Merge branch 'master' into semigroup