Composer block 7

Fixes #174