Fixes #9, #10