Fixes #33, fixes #32.