Composer block 2

Fixes #169