Workshop edit

Fixes issue #34