Change of plan

Fixes #25