Issue 34

Fixes #34