Issue34

Fixes #34.