Fixes #17
Creates #32