My guess is that this closes #32

But not sure...