test for a third type of clay
Merge remote-tracking branch 'origin/master'