Fixes #33, #32