Fixes #10, #9