(Fixes #10)