Fixes #5
Fixes #32