Issue32

Fixes #32