Fixes #29
Fixes #32