Fixes #4, starting on #15.