Patch 24

Fixes #24.