tried without Shub
Merge branch 'master' into solutions